This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Persist querystrings in mapbox:// resource urls to API requests #6182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jakepruitt, thanks for your PR! By analyzing this pull request, we identified @jfirebaugh, @yhahn and @1ec5 to be potential reviewers. |
| @@ -44,7 +44,13 @@ std::string normalizeSourceURL(const std::string& url, const std::string& access | |||
| throw std::runtime_error("You must provide a Mapbox API access token for Mapbox tile sources"); | |||
| } | |||
|
|
|||
| return baseURL + "v4/" + url.substr(protocol.length()) + ".json?access_token=" + accessToken + "&secure"; | |||
| auto queryIdx = url.find("?"); | |||
| std::string query = ""; | |||
There was a problem hiding this comment.
Omit = "" -- it'll be initialized to an empty string automatically.
jakepruitt
force-pushed
the
keep-queries
branch
2 times, most recently
from
373b764
to
d4098d7
Compare
| std::string query; | ||
| if (queryIdx != std::string::npos) { | ||
| query = url.substr(queryIdx + 1, url.length() - queryIdx + 1); | ||
| if (query.length() > 0) { |
There was a problem hiding this comment.
Generally if (!query.empty()) { is better practice since it is faster than query.size().
springmeyer
force-pushed
the
keep-queries
branch
from
d4098d7
to
17e6591
Compare
|
Made a refactoring pass and rebased this /cc @jakepruitt. Ready for review by others, notably @jfirebaugh @1ec5 |
| @@ -11,15 +11,16 @@ namespace util { | |||
| namespace mapbox { | |||
|
|
|||
| const std::string protocol = "mapbox://"; | |||
| const std::size_t protocol_length = protocol.length(); | |||
Carries over any query strings from mapbox://-prefixed styles urls, source urls and tile urls to the api.mapbox.com requests.
jfirebaugh
force-pushed
the
keep-queries
branch
from
17e6591
to
9134ddd
Compare
jfirebaugh
approved these changes
Sep 16, 2016
|
Thank you @jfirebaugh! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Carries over any query strings from
mapbox://-prefixed styles urls, source urls and tile urls to theapi.mapbox.comrequests.cc/ @mapsam @1ec5 @jfirebaugh @yhahn @GretaCB